100. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-07-21 10:22:00 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

100.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Customer/templates/formforgotpassword.phtml2021-02-04 04:20:22 +0000
2/Applications/Ampps/www/Porto v4.0.1/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Customer/templates/formforgotpassword.phtml2021-02-04 04:20:22 +0000

100.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged168
Changed00
Inserted00
Removed00

100.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

100.4 Active regular expressions

No regular expressions were active.

100.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Copyright © Magento, Inc. All rights reserved. 3  * Copyright © Magento, Inc. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  * 5  *
6  * @var $block \Magento\Customer\Block\Account\Forgotpassword 6  * @var $block \Magento\Customer\Block\Account\Forgotpassword
7  */ 7  */
8  8 
9 /** @var \Magento\Customer\Block\Account\Forgotpassword $block */ 9 /** @var \Magento\Customer\Block\Account\Forgotpassword $block */
10 ?> 10 ?>
11 <form class="form password forget" 11 <form class="form password forget"
12       action="<?= $block->escapeUrl($block->getUrl('*/*/forgotpasswordpost')) ?>" 12       action="<?= $block->escapeUrl($block->getUrl('*/*/forgotpasswordpost')) ?>"
13       method="post" 13       method="post"
14       id="form-validate" 14       id="form-validate"
15       data-mage-init='{"validation":{}}'> 15       data-mage-init='{"validation":{}}'>
16     <fieldset class="fieldset" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>"> 16     <fieldset class="fieldset" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
17         <div class="field note"><?= $block->escapeHtml(__('Please enter your email address below to receive a password reset link.')) ?></div> 17         <div class="field note"><?= $block->escapeHtml(__('Please enter your email address below to receive a password reset link.')) ?></div>
18         <div class="field email required"> 18         <div class="field email required">
19             <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label> 19             <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
20             <div class="control"> 20             <div class="control">
21                 <input type="email" name="email" alt="email" id="email_address" class="input-text" value="<?= $block->escapeHtmlAttr($block->getEmailValue()) ?>" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}"> 21                 <input type="email" name="email" alt="email" id="email_address" class="input-text" value="<?= $block->escapeHtmlAttr($block->getEmailValue()) ?>" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
22             </div> 22             </div>
23         </div> 23         </div>
24         <?= $block->getChildHtml('form_additional_info') ?> 24         <?= $block->getChildHtml('form_additional_info') ?>
25     </fieldset> 25     </fieldset>
26     <div class="actions-toolbar"> 26     <div class="actions-toolbar">
27         <div class="primary"> 27         <div class="primary">
28             <button type="submit" class="action submit primary"><span><?= $block->escapeHtml(__('Reset My Password')) ?></span></button> 28             <button type="submit" class="action submit primary"><span><?= $block->escapeHtml(__('Reset My Password')) ?></span></button>
29         </div> 29         </div>
30         <div class="secondary"> 30         <div class="secondary">
31             <a class="action back" href="<?= $block->escapeUrl($block->getLoginUrl()) ?>"><span><?= $block->escapeHtml(__('Go back')) ?></span></a> 31             <a class="action back" href="<?= $block->escapeUrl($block->getLoginUrl()) ?>"><span><?= $block->escapeHtml(__('Go back')) ?></span></a>
32         </div> 32         </div>
33     </div> 33     </div>
34 </form> 34 </form>